$OpenBSD: patch-test_run-stp-tests_sh,v 1.17 2016/10/05 18:28:17 ajacoutot Exp $
--- test/run-stp-tests.sh.orig	Mon Oct  3 21:55:40 2016
+++ test/run-stp-tests.sh	Wed Oct  5 19:46:11 2016
@@ -34,7 +34,7 @@ umask 022
 # Make the IPP test program...
 #
 
-make
+${MAKE_PROGRAM}
 
 #
 # Solaris has a non-POSIX grep in /bin...
@@ -596,7 +596,7 @@ fi
 
 export LD_LIBRARY_PATH
 
-LD_PRELOAD="$root/cups/libcups.so.2:$root/filter/libcupsimage.so.2:$root/cgi-bin/libcupscgi.so.1:$root/scheduler/libcupsmime.so.1:$root/ppdc/libcupsppdc.so.1"
+LD_PRELOAD="$root/cups/libcups.so.${LIBcups_VERSION}:$root/filter/libcupsimage.so.${LIBcupsimage_VERSION}:$root/cgi-bin/libcupscgi.so.${LIBcupscgi_VERSION}:$root/scheduler/libcupsmime.so.${LIBcupsmime_VERSION}:$root/ppdc/libcupsppdc.so.${LIBcupsppdc_VERSION}"
 if test `uname` = SunOS -a -r /usr/lib/libCrun.so.1; then
 	LD_PRELOAD="/usr/lib/libCrun.so.1:$LD_PRELOAD"
 fi
